Workaround new call to do_softirq in scrub_heap_pages in common code

diff --git a/xen/arch/ia64/xenmisc.c b/xen/arch/ia64/xenmisc.c
index 4b76af8cab92b2fb21af96fa958032c7f60af233..7a8000a9c6d4d8dad77256d512b2020d7eba5fca 100644 (file)
--- a/xen/arch/ia64/xenmisc.c
+++ b/xen/arch/ia64/xenmisc.c
@@ -115,6 +115,8 @@ unsigned long __hypercall_create_continuation(
 // from arch/x86/apic.c
 ///////////////////////////////
 
+extern unsigned long domain0_ready;
+
 int reprogram_ac_timer(s_time_t timeout)
 {
        struct vcpu *v = current;
@@ -123,6 +125,7 @@ int reprogram_ac_timer(s_time_t timeout)
        if(VMX_DOMAIN(v))
                return 1;
 #endif // CONFIG_VTI
+       if (!domain0_ready) return 1;
        local_cpu_data->itm_next = timeout;
        if (is_idle_task(v->domain)) vcpu_safe_set_itm(timeout);
        else vcpu_set_next_timer(current);